[webkit.UncountedLambdaCapturesChecker] Fix a regression that [[noescape]] on a member function no longer works. #126016
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ape]] on a member function no longer works. We should skip the first argument for CXXOperatorCallExpr, not other kinds of calls.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang-static-analyzer-1 @llvm/pr-subscribers-clang Author: Ryosuke Niwa (rniwa) ChangesWe should skip the first argument for CXXOperatorCallExpr, not other kinds of calls. Full diff: https://github.com/llvm/llvm-project/pull/126016.diff 2 Files Affected:
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedLambdaCapturesChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedLambdaCapturesChecker.cpp
index 53ef423bd82e7e2..a56f48c83c660a9 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedLambdaCapturesChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedLambdaCapturesChecker.cpp
@@ -109,9 +109,7 @@ class UncountedLambdaCapturesChecker
bool VisitCallExpr(CallExpr *CE) override {
checkCalleeLambda(CE);
if (auto *Callee = CE->getDirectCallee()) {
- unsigned ArgIndex = 0;
- if (auto *CXXCallee = dyn_cast<CXXMethodDecl>(Callee))
- ArgIndex = CXXCallee->isInstance();
+ unsigned ArgIndex = isa<CXXOperatorCallExpr>(CE);
bool TreatAllArgsAsNoEscape = shouldTreatAllArgAsNoEscape(Callee);
for (auto *Param : Callee->parameters()) {
if (ArgIndex >= CE->getNumArgs())
diff --git a/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp b/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp
index 2a1a164557cdbe7..b6e84769fdf7247 100644
--- a/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp
@@ -63,6 +63,18 @@ template<typename Out, typename... In> Function<Out(In...)> adopt(Detail::Callab
return Function<Out(In...)>(impl, Function<Out(In...)>::Adopt);
}
+template <typename KeyType, typename ValueType>
+class HashMap {
+public:
+ HashMap();
+ HashMap([[clang::noescape]] const Function<ValueType()>&);
+ void ensure(const KeyType&, [[clang::noescape]] const Function<ValueType()>&);
+ bool operator+([[clang::noescape]] const Function<ValueType()>&) const;
+
+private:
+ ValueType* m_table { nullptr };
+};
+
} // namespace WTF
struct A {
@@ -268,6 +280,17 @@ struct RefCountableWithLambdaCapturingThis {
nonTrivial();
});
}
+
+ void method_captures_this_in_template_method() {
+ RefCountable* obj = make_obj();
+ WTF::HashMap<int, RefPtr<RefCountable>> nextMap;
+ nextMap.ensure(3, [&] {
+ return obj->next();
+ });
+ nextMap+[&] {
+ return obj->next();
+ };
+ }
};
struct NonRefCountableWithLambdaCapturingThis {
|
t-rasmud
reviewed
Feb 6, 2025
| class HashMap { | ||
| public: | ||
| HashMap(); | ||
| HashMap([[clang::noescape]] const Function<ValueType()>&); |
Contributor
There was a problem hiding this comment.
Should we also have a similar test case for a non-member function?
Contributor
Author
There was a problem hiding this comment.
A good point! Added a test case for static function & non-member function.
…and a non-member function.
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/81/builds/4482 Here is the relevant piece of the build log for the reference |
Icohedron
pushed a commit
to Icohedron/llvm-project
that referenced
this pull request
Feb 11, 2025
…ape]] on a member function no longer works. (llvm#126016)
rniwa
added a commit
to rniwa/llvm-project
that referenced
this pull request
Feb 13, 2025
…ape]] on a member function no longer works. (llvm#126016)
devincoughlin
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Feb 25, 2025
…ape]] on a member function no longer works. (llvm#126016)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We should skip the first argument for CXXOperatorCallExpr, not other kinds of calls.